Undo the tag order (since that's quicker)

and added val rewiring test case