simplify tests
cleanup