Docs and test updates
Docs update