Simple test refactor