Cleaning up tests [in progress]
refactoring