Removed some unnecessary  mocking of class under test