Refactored the unit test package to maintain consistency