Refactored unit test packages