C++ implementation progress.
More test cases.