Please put these tester changes and a simple D/C++ test case into another pull request, so we can get that in first.