Minor enhancements/fixes to graph managers and better test coverage