improve timing in test to wait for state with graceful timeouts
(yet, validate early and exit when relevant)