Improved mock generator.