Merge "Late binding: add more Cipher tests"