Convert cli tests to tape
Convert other tests to tape & fix