added DataMapper + tests
removed unused testcase