A few more tests and some clean up