Fixed phpunit tests