Update for submodules and global phpunit