Merge "Dial back the multi-tenancy testing"