[BUGFIX] Fix tests throwing errors in MapperTest