rewrite the way model is waited in live tests