FFI test cases fixes
Merge branch 'ChocoButter-2Become1' of https://github.com/ikeough/Dynamo into ChocoButter-2Become1