Get some more c++ tests running