Minor test refactor.