Work around to support test tenant