removed cpptest stuff.