enable more tests
cleanups