Extra scc tests

Fold the extra strongly-connected component tests into the SCC graph work.