Update cpptest.h

Fixed a couple of small bugs.