Fixed compile warnings on mac
Fixes and updates to test framework.
Merge branch 'fancy-api-test-fix' into fancy-api