Additional fixups and graph tests