Fixing issue introduced with test refactor