Merge "Re-enable SingleFeatureTest"