Making timing in tests depend on server-side status, eliminate blocking, phase 1