Add a few more tests and some initial cleanup