Moving cli and fixing tests
0.1.3