Bugfix PHPUnit tests