fix a few small issues with walkthrough tests
Minor fixes to wireshark test
Merge branch 'cdburkard-patches/test_walkthrough'