Merged in upstream changes; improved ECDSA test expression