Fix broken tests from refactor