Removed need for mockery or fakeQ