removed more cpptest stuff.