Merge of Stephen's description, updated actual outputs, fix of a few
test names/descriptions/input arguments.