Updated to include timeout for tests