Added mocks and removed operator and repleced with for loop and list comprehension