Fixed PHP 5.3 issues.
Checking PSR2 compliance of tests as well.