Yes. Two checkrides and two knowledge tests. There is a separate knowledge test to add on the helicopter II to airplane II or the other way around. It is only 25 questions and you have an hour. There is no requirement for another knowledge test to add the helo rating to your airplane commercial. The test requirements to add a rating to an instructor certificate are found in 61.183(h).