More docs, fix tests