Refactor feature specs