Use more conservative timeouts for tests

Change-Id: I9c754a3ab54aeaffeb1e9fa7efce6d8bbeb92d51