Fixes for test_cffi.py