cleanup: git-extract tests
Merge branch 'master' into cr-cleanupGitHack