passing all tests after removing dependency on id of sniff