Refactor assert_non_tenant usage