The timeout test was waiting for 10 seconds - unnecessary, lowered it to 1 second.