Added tests for the enhanced mapping