More tests for graph validation. am: 6174f00cc6

Change-Id: I01ce53ff569deaf38426fa16a1b25618c74dfd56