Made test helper methods easier to read