Add tests for disjoint unions
Add mappings support