Update cross origin tests for v2.0