Upped timeout for tests to 30 seconds.