Merge "change test map" into main