controller_id format update + test fixes

1 job for master
in 1 minute and 24 seconds and was queued for 1 second