Reorder properties
wip: Added test
Implemented computing merged identity
Added integration tests
Changed identity to global
Fixed identity specification