Setting test.timeout according to TEST_TIMEOUT (#3920)

5 files changed