fix test bug
merge