Add in testing of default handling
Add tests for recipient