re-organize tests