We agree that Test Track does take a lot of time with Baby swap. We have done all rides with Baby Swap and all but Star Tours give you a Rider Switch pass to use & enter through the Fast Pass entrance (We just got back too on June 17). Star Tours everybody waits in line and then when 1st group is done group 2 gets on & group 1 takes kids out (best one).
Soarin uses the Rider Switch Pass & Fast Pass lane. It takes forever. It takes at least 30 minutes for group 1 (first thing in the AM or with fast pass) and then at least another 30 minutes for group 2 through fast pass lane. We even did where one group would do the boat ride while the other rode Soarin and the 2nd group was done with the boat and still had a 20 minute wait for us.
The problem with Rider Switch/Baby Swap is when the ride is long, has a preshow, or fastpass is long then it takes an hour just for everyone to ride (2 groups). We found that the Singles line is the best wait to ride Test Track. When we did last week we waited 30 minutes and the Single riders in our car only waited 10 minutes and were together in the same car.
We found that if we were getting fast passes then we didn't really need a Rider Switch, but got one anyway in case the 2nd group didn't get there in the time window then they could still get in.
The best rides for Baby swap were:
Star Tours, Big Thunder, Space Mountain
The worst are:
Test Track, Soarin, Splash Mt. (Ride is long), Rockin (fastpass line always clogs up), Tower of Terror, Dinosaur (most of these have Pre-shows & it takes twice as long for both groups to go through when group 1 uses a fast pass - I guess you would save time if group 1 waited in Standby and then 2 did Fast Pass Rider Switch)