timeout tests

Change-Id: Ie6dfa8bf891d2c7e44c966e59f972bc1c5babb50