Feature test fixes