fixes some deferrer problems, improve graphmock and test on graphs