fixes feature toggle to fail nicely and handle tests correctly