Update tests and doc for last merged PR