Changes for PHPunit tests