All of the tests now refactored