Fix #201: Remove empty nested rulesets

Update Gonzales and add tests