Minor test refactor