Added some more tests around the handling of commands.