Fix sniffs and add tests