improve tests on skill rules
Merge branch '5095-arithmetic'