More tests and docs yet again.