fix empty rule test
fix 2 more tests
fix a few more tests