Minor tweaks to argument handling
Remove test graphs from scm