Updated mock class and made changes to data mapper