Some extra docs and tests