Some more tests and docs