Bring test suite back to passing state after Repo refactor.