Added tests for command line script; changed comments and spacing