Tests hang but a little closer to a solution here.