Fix Feature tests