Merge "Revert "Re-enable EnableCollection/IsCollected tests""