Updating unittests for v2 stuff