Moved default_timeout methods and added context to related specs