Fix gittyup tests.

This fixes a number of gittyup tests for me, with the exception of the stage.py status() tests.