Merge "Clean up unused unit testutils" into main