Update tests to match expected mappings