Add a timeout to speed up the test from 60 seconds down to 5ish
Shorten a few more RM tests to poll for result instead of a long wait and then check