Getting ready to make FP+ for Easter week, are soarin & test track still grouped?

[bcinohio]

We will be at WDW the week of Easter. I'm getting ready to make FP+. I was just wondering if Soarin & Test Track are still in same group or can you book both?

 

[tweak89]

The tier system is still in place