Use alpha1 and alpha2 OAS servers per variant
Fix a bad merge for RightPopular tests