Added tests to CLI