More progress, but the tests still hang.

mst++ for helping.