Refactored some more tests