Refactor feature test