More technical debt payoff.

Applied refactoring across the entire acceptance test code base.