A bit further...
Remove the C++ tests for now.