Cleanup and additional crypto tests.