Update strrtok to act more like strtok, with test code updated to use strtok for comparison.

Issues will surely arise from platform discrepancies...