[WIP] - Tenant test

Relies on #1290