#46 cleanup -- write the unit tests that would have saved at least a man-day
#46 cleanup -- name said tests correctly