Re-organize test pages