Merge "Revert "Move tests to presubmit"" into main