re-organize tests by package