Refactor feature spec