Added V2 test code