Added integration tests for AES and fixed unit tests
Merge pull request #149 from jd1123/aes_integration_tests

Added integration tests for AES and fixed unit tests