Have updated structures & tests