Update docs, fix tests