Reformed PactGenerator, fixed model and consumer tests