[wip] Update docs, correct tests