MINOR: Try to fix CLI tests (still not working)