Refactored test packages structure