Updated tests and added imports/exceptions

This commit updates the unit tests for the new encryption routine. It
also adds some missing imports and exception declarations.
Merge pull request #9 from jsumners/feature/AES128-CBC

Updated tests and added imports/exceptions