Merge "Add test mapping" into main