Graph tweaks, added test file