Added timeout to tests