HospitalMapping update (Unit tests work separetely)