Changes in a couple of mock-producing classes