fixing the errors as test framework modifications

And also Tenant mode is  disabled for the moment until to fix the test framework