fixing tests
cleanup