more tests, clean up