Fix the testprog a bit...