More tests and and docs!