Merge "Remove tests that were skipped for MCR-enabled schema"