Refactored test pkg.