Fix the save w/ callback test
merge upstream
add ability to mark rule as generator or restat