Mocks and coverage tests added