smoketest: rework and roll into make.sh