Fixes for GraphType test