Taking Tom's comments into account (and also fixing an error in a test .good
file, whoops!)