Update README and test cases with new crypto options.
Update usage text.