Remove std::string input arguments and replace with "const char *".
Add testcase missed yesterday. Patch from Paul Robinson.