Merge "Disable tests that use the old logic." into main