Update sharness tests to test the new CLI