Convert one of the `setup_test_homeserver`s to `make_test_homeserver_synchronous`

and pass in the homeserver rather than calling a same-named function to ask for one.

Later commits will jiggle things around to make this sensible.