Clean up the traceroute test

Match UDP and TCP based on destination and source port instead of IP ID