Add extra options to grant define. Add tests for grant.pp.