fix test findings