changes for phpunit testing