Fix CLI test as well.