Fixed some unit test failures due to undeterministic ordering of graph elements and class methods.