refactored the timeout functionality for curators and associated tests