improved Crypto tests