Cpp test/make tests pass develop