Refactor test to make it easier to find failures.