Revert crypto test changes because they break Python 3