Fix inconsistency in help handling.
Compressed the testing code by using TB.Assertf() more often