Fixed PHPUnit tests