Test generator refactoring to prepare for new features.
Refactoring and bug fix.
Little more functionality for the help command.