Bug fix of EVP test cases