Reverted test refactoring - no significant impact.