Doc + test updates