cleanup and a couple more tests