Re-organize tests