Fix uniqueifying of orgs to not mess with label unless it has been set already
Fix users test (bad args to assoc)
Fix creating systems with details