Make v6 tests compilable after sync to mainline
Merge pull request #25 from Juniper/v6-test-update

Make v6 tests compilable after sync to mainline