Fix tests that made assumptions about tag ordering