Move empty-set.stderr to its right place; switch order of last two tests