Adding Functional tests for v2