Aligning barcode config format with barcode generator.

Broke up tests
Undo this.