Sort members
Remove string escaping for now, fix tests