updated tests for changes to generator