some minor fixes for multitenancy tests

Avoid using {...} for multi-line blocks.