Fixed existing tests after refactoring