Merge "Add some test mappings"