Update test program to use WantsComments