Merge pull request #281 from eric-wu/develop

Fix test failures caused by the new encryptor