Cpp test/fix callback tests develop