Merge "Add tests to Crypto module"