And another one
New rules
Rewrite testsuite WIP
Clear up some duplicates