more tests, cleanup