More testing
Doc edits
Tighten assert