Merge "Add strlen tests. DO NOT MERGE"