Merge "Re-enable EnableCollection/IsCollected tests"