Refactoring for clarity of tests.