Changed timeouts to 1 minute from 30 because of occasional long runs on CI boxes.  None of these tests takes more than 5 seconds on my mac