Updated Tests to Reflect StateFigure.class