#77 remove dependency from mocks to clean