Fixed cxxtest