[CXF-5902] Completing AesCbcHmac encryption/decryption test, some cleanup to follow