Got the tests working for the refactor.