re-add cpp tests plus fix
Merge branch 'cpp-test-fix' into openfl-project-updates