Make v2 tests point at v2 code