UHM-881 Fix unit tests and move then to TimeSlotServiceTest