Add sniffer and tests