more tests; cleanup