fold tests/cli into tests/unit

* rename descriptor params.lib to params["lib-DISABLED-BZ6046277"] to disable coverage where they currently interfere with the test's use of mockery
* mv descriptor files so they follow arrow convention
* fix merge conflicts