Refactor Test Packages