Moved UPPTest back in place. Errors and updated phpunit files.