Added timeout in teardown because of intermittent test failures