Fixed expect statements.
Improved generator.
Fixed expect statements.
Added mkdirp.