Port v1 tests to v2.