Updated tests for generator 0.11