Forgot to make a change to unit-tests: getGenerator() interface changed.