Fix test failure with hostname
Fix job changes for timestamper upgrade