Refactor tests with rematch