Adjustments to piecework-test