Fix merges and tests, also renamed :identity to :user-id#5

msprunck wants to merge 5 commits intogbuisson:refactorgbuisson/ctia:refactorfrom

yogsototh:gb-refactoryogsototh/ctia:gb-refactorCopy head branch name to clipboard