Adding tests for multi-tenancy