Adding tenantId to policies and removing mandatory isPublic from test-schema