Merge "Update test mapping to use correct module name" into main