Merge "Make EnableCollection using tests more robust"