Fixed PHPUnit Tests