Fixing tests from previous refactor