Merge pull request #120903 from Faless/crypto/more_module_tests