Added DataMapTest