Merge "Remove skips for EnableCollection tests"