reorg test packages to run with JUnitRunner