Revert "Removed tests for feature flip"

This reverts commit 957abe10109f52d43cab08f28a9b2fc053b5fad4.
Test for feature flip + on build server