re-org some tests