Improve test error messages, add waitUntil, use provided Conditions,