Added test for V2 upgrade