fix tests
cleanup