Merge "Update TEST_MAPPING for VPN tests" into main