Carp  fix queues and tests v3

More fixes, some to unit tests and some to fix flow mod handling formatting.