Improvements and critical bugfix

- Updated PHPUnit
- Fixed an incorrect method name
- Fixed some docblocks

Can you tag this if you merge?