diff --git a/test/local/tcp_tester.py b/test/local/tcp_tester.py
index ff654d3a..b14a8bdb 100644
--- a/test/local/tcp_tester.py
+++ b/test/local/tcp_tester.py
@@ -224,7 +224,7 @@ def __init__(self, client_vm, client_port, pf_spec, server_ip, server_port, clie
 	# Virtual-service communication, no tunnel, replace header with IPv6
 	def get_server_l3_reply(self, pkt):
 		return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
-				IPv6(dst=router_ul_ipv6, src=pkt[IPv6].dst, nh=6))
+				IPv6(dst=pkt[IPv6].src, src=pkt[IPv6].dst, nh=6))
 
 class TCPTesterPublic(_TCPTester):
 	def __init__(self, client_vm, client_port, nat_ul_ipv6, pf_spec, server_ip, server_port, client_pkt_check=None, server_pkt_check=None):
diff --git a/test/local/test_telemetry.py b/test/local/test_telemetry.py
index 0c23c91d..ee97e05a 100644
--- a/test/local/test_telemetry.py
+++ b/test/local/test_telemetry.py
@@ -27,7 +27,6 @@
 HW_IFACE_STATS = (
 	'rx_broadcast_bytes', 'rx_broadcast_packets', 'tx_broadcast_bytes', 'tx_broadcast_packets',
 	'rx_multicast_bytes', 'rx_multicast_packets', 'tx_multicast_bytes', 'tx_multicast_packets',
-	'rx_out_of_buffer',
 	'rx_phy_bytes', 'rx_phy_crc_errors', 'rx_phy_discard_packets', 'rx_phy_in_range_len_errors', 'rx_phy_packets', 'rx_phy_symbol_errors',
 	'tx_phy_bytes', 'tx_phy_discard_packets', 'tx_phy_errors', 'tx_phy_packets',
 	'rx_prio0_buf_discard_packets', 'rx_prio0_cong_discard_packets',
@@ -41,7 +40,7 @@
 	'rx_unicast_bytes', 'rx_unicast_packets', 'tx_unicast_bytes', 'tx_unicast_packets',
 	'rx_vport_bytes', 'rx_vport_packets', 'tx_vport_bytes', 'tx_vport_packets',
 	'rx_wqe_errors',
-	'tx_pp_clock_queue_errors', 'tx_pp_jitter', 'tx_pp_missed_interrupt_errors', 'tx_pp_rearm_queue_errors', 'tx_pp_sync_lost', 'tx_pp_timestamp_future_errors', 'tx_pp_timestamp_order_errors', 'tx_pp_timestamp_past_errors', 'tx_pp_wander',
+	'tx_pp_clock_queue_errors', 'tx_pp_missed_interrupt_errors', 'tx_pp_rearm_queue_errors', 'tx_pp_timestamp_future_errors', 'tx_pp_timestamp_order_errors', 'tx_pp_timestamp_past_errors',
 )
 HW_PF1_IFACE_STATS = (
 	'rx_q1_bytes', 'rx_q1_errors', 'rx_q1_packets', 'tx_q1_bytes', 'tx_q1_packets',
diff --git a/test/local/test_virtsvc.py b/test/local/test_virtsvc.py
index d72a6455..88469385 100644
--- a/test/local/test_virtsvc.py
+++ b/test/local/test_virtsvc.py
@@ -23,7 +23,7 @@ def reply_udp(pf_name):
 	udp_used_port = pkt[UDP].sport
 
 	reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
-				 IPv6(dst=router_ul_ipv6, src=pkt[IPv6].dst, nh=17) /
+				 IPv6(dst=pkt[IPv6].src, src=pkt[IPv6].dst, nh=17) /
 				 UDP(dport=pkt[UDP].sport, sport=pkt[UDP].dport))
 	delayed_sendp(reply_pkt, pf_name)