Fix test failures introduced by doc changes