Catch the Spring Dijkstra train and rationalized the test matrix