Some test helpers and an extra test or two