Model docs and test improvements