Extend Sniff and Unit tests for issue #225