C++: Cleaning Up and Clarifying

Consolidating tests, and using better names, practices and examples