Improve specs for Notify and generators