Draft: Try to get test_build() working with new wait_for()

It isn't quite working 100%, but it's more reliable than before. I think I'm going to have to make some of the allow_one_advance calls much more fine-grained.

I'm going to keep working on this, but I'm uploading it here for now in case any of my mistakes are obvious.