Add the ability to return full message option objects from handlers.
Add tests for option passing from handlers