Get rid of some unused imports
Use packet-buffering for tcpdump

This should make sure we have all the packets from the test saved off,
instead of possibly having some (or all) missing data.