Enhanced AES-Service
Starting to write unit tests