Moving to python2
Adding tests for command line usage