am dce989e5: Merge "Update Cipher tests"

* commit 'dce989e53c440c7bb0eec93abf20a71bf1f49b1c':
  Update Cipher tests