std::regex not yet ok for gcc, some test fixes