fix tests, change scanner rules