Fixed failing Unit test for Mapping