Add a few more unit tests around commands