Merge "Delete TestHelpers.h" into main