Fix tenants test
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue-3706