Added more DataMapper tests