Removed .andCallFake calls when not necessary