Add more testing to new crypto_engine

This commit makes the new crypto_engine a little
bit more compatible with the old crypto engine