Fixing unit test compilation error inroduced by code refactoring