Use timeout fixture (30 seconds) for tests

Change-Id: I64c29c3c8be66c24c4d9f26767e96200dc83dae4
Merge "Use timeout fixture (30 seconds) for tests"