Graph tests cleaned-up