Refactored the tests a bit to better reflect what they are testing