Fix unit tests and urls for v2