updates to test doc after merge conflict