Merge "Move identity v2 tests to their own folders"