MakeService.hasToxicBottles() + MakeServiceTest modified