Add V2 tests for switchyard