Fix problem with first-time test and testno=1