Reshaped graph object for better testing and expection handling