fixed lint problems, removed mocks