Remove few unnecessary lines
Better tests of rules generation