Both declarable heading and commodity can be meursing codes

fix flaky spec too