Fixes for git_test now that we have other content in it