resync producer and tag test, moving more stuff into new cfi and cff