Fix tests and git requirement

Fix incompatibility between #63 and #65, which causes 2 tests to fail. Fix git requirement introduced by #63.