feature test fixes