Bugfix to make PHPUnit tests run again