Merge "Add strlen tests."