Refactored existing test packages.