Further improved code. Category is not required anymore for decryption (stored in cypher). Improved unittests