Port tests to c++98