More tests and docs