Sniffer fixes
Track->tracking and out of the constructor
Little test cleanup