Adding in tenant isolation into the mock rest endpoint