Fix MultiTenancyTest
Fix ResetPasswordTest