More work to make tests pass doc series->collection rename