Tests almost completed, pending traffic_spy testing