Got the tests working after the refactoring