cleanup
more tests