updated tests
cleanups