Simplify / refactor the tests slightly