Add contact details only if requested
Update tests for optional contact details