Changed detailed output format.  Updated expected test output files accordingly.