Doc updates and test additions

Good points. Take a look at the current version.