Just a couple helper methods.
Merge remote-tracking branch 'origin/master'
Some naming cleanup and using some new PHPUnit asserts.