Refactoring feature tests