Bugfix PHPUnit errors + Make PSR-2 compatible