Merge "Add extra strchr testing."