More test goodness