OK, these seemed simple enough that functions seemed ideal to me.  I'll swap them out for class tests though.

Curious, is there an advantage other than uniformity? (Uniformity is a totally sufficient reason on it's own.)