Fix DoiMapper and create integration tests