Pull testing switches into hidden tab
Refine rebound classes