fix test and doc failures