test cleanup, new graphing functionality