Fix `--cache-dir` not actually being marked as a required flag.
Remove references to master from tests