Fixed mocks in tests and provided a common class as a central point for reset