Extend Sniff and Unit tests for issue #225

Fixes #225.