clean up and more tests