Test cleanup

@kevgo

Push some code into helpers and introduce a few more run helpers
Here is how nice that would read in the DSL version:

`output_of('git status').include? "You are currently cherry-picking"`