Add tests to verify that generating the expressions work
Fix handling of optionals in xml provider
Merge changes