struct init changes - need to sort initialisers
More init tests