Finished tests, finalized integration with previous graphs