Merge "Apply alternatives to vector refract tests" into nyc-dev