Fixing issue with test refactoring.