fix test after merge