Fix refactoring fixes

Fix broken test before implementing new features