clean up tests, renaming