Updated tests. Added encryption tools.