Reorganized unit tests by package