Merge "Revert "Remove skips for EnableCollection tests""