Update data mapper and tests. Fix bugs