Make it possible to run the test file on its own and not just via rake
Make tests pass again

Broken in commit 2c836e6f2c30d341076ff04477cec64b569d383e, when support for multiple repositories was added.

We really need an easier way to get tests running, perhaps even set up on Travis?
Clean up formatting
Less instance variables for more predictable tests