More rule tests (and fixes for existing).