test package is reorganized.