make all test files pass again, after refactor