CDITCK-379 Improve the way test timeouts are implemented