Incorporate the use of timeout. This update will not impact any existing...

... test cases.