fixed tests
cleanups