phpunit functional test updates