add datamapper, some tests