Use native wait until

A few minor fixes to the acceptance tests, mainly replacing our own wait until with the native one in the SDK.