Merge "Update v3 project tests to work w/ pre-prov"