Fix incorrect test exposed by previous fix for re-using data structure