Checkin prior to first setup test
make more package-y