Update test runner. Fix wait tests