Added some mapping related test