Refactoring deprecation warnings for AES
Removing test data.