refactored test packages