Adding in more tests for command line tools.