(+) Crypto test, some fixes