Fixes the README and some CLI tests