* Fixing PHPUnit tests