Refactoring the test to make some the tests clearer