Update fixtures to include gar/nix (which is being replaced) and bar/baz (which has a branch-alias)