Little cleanup (and a test for Git :)