refactored more of the tests