FFI Test cases fixes, and deletion of tests targeting the C++ FFI implementation (!)
FFITarget fix up from merge