clean up and a few more tests