More docs and tests