Fix more failing tests for C++98 mode