Cipher Tests added
Merge origin/master