All tests pass (except for the cpptests, which have a known problem)
But still *many* debugging lines.
Debug statements removed, tests pass.