Move the v2 tests under the v2 tree