[4.x] Improve test coverage#1450

lukinovec wants to merge 2 commits intomasterarchtechx/tenancy:masterfrom

coveragearchtechx/tenancy:coverageCopy head branch name to clipboard