Fix failing tests with new crypto engine
Fix all failing tests with new crypto engine