Updated the data mapper js. More tests