angshu | integrating with Latest MCI. Contract changes, added tests etc
angshu | renamed AddressMapperTest to AddressTest