Rewrite some bits of factory boy