Fix for tenancy and history test on history level none