AESTest extended and minor changes