This entire new class should get tests, since you're in a refactoring phase anyway.