Merge "Clean-up tests in test_vsperf_dpdk.py:VsperfDPDKTestCase"