More tests, + doc changes.