Move this into the waitFor test