Ben: updating timeouts for tests. sad...