Revert "Update Unit Tests for M2/M3 (#131292)"

This reverts commit 5d76d1a561240dd7aaf7173dcbe91d5725bc8750.