Add more basic tests and some clean up.