Test now completes

Bleh. Can't even keep track of the changes I made. Point is, test still
fails, but at least it gets to the end without hanging.