Added arcs and tests