Additional mapping test cases