Decreased timeout for tests to 60s