Removed tests for feature flip