More fixes to get more tests to pass

Fixed exit code for commands.  Fixed a bug in top command found by tests.
Adjust top command output and update test baselines.