Jeremy | Refactoring of methods and tests