Down to the last 4 failing CLI tests.