Fix from Test refactoring