singleton tests pass, graph tests adjusted