fix require for-label ordering; add tests