Add tests for fixes I committed earlier to the C++ FE.