Minor test refactory