More tests, more idiomatic doc comments