Try for better C++, and work on 1st test.