Merge "Add @coversNothing for left over tests and enable sniff"