Merge "Remove fixed CipherTest "known failure""