Fixed tests to remove partial mocking on class under test.