UHM-974 Fix unit tests and move then to TimeSlotServiceTest