Rep 892 - Tenant ID Check in Client Auth

Fingers crossed
Clean this assertion stuff up in general.