Fixed some dependencues, for now mocks are generated in two places though.