Change test for including q-value
Align with ABNF, move q-value to end