Change mock generation for tests