Unbroke the CLI tests