re-organize tests.