Merge "Add negative mapping test"