Add some mapping tests