starting to cleanup tests