Doc updates and test improvements