Updated graph generators
updated testing functions