Yet more tests and minor code revisions.