Fix tests
Fix sniffs