Fix up the CLI deps and fix the test so it doesn't trip over each other