more tests, some cleanup