Fix CBC encryption, test