refactor: remove commented-out code and improve timeout settings in orchestrator.py and test_activities.py