Added some more tests and changed the output on a few commands.