Start fixing org tests, implement protocol for navigating to entites (that will switch orgs first)