Merge "Rework TestSampleVnf"