cleaning up stuff and deciding what to do with tests