Added AES and test