Merge "Move expectFail to TestUtil" into main