Changing way sagas are indexed to ensure uniqueness
Massive commit with integration tests and lots of fixes