test fix after refactoring