These can move to the unit tests now, I think.