Merge "Fix class name of BcryptPasswordTest"