Added special cases to cope with Travis incorrect git status for the test repository.