More test cases and a couple fixes/doc enhancements.