re-enable tests
cleanup
bugsquashin