Undo change of test from before it was testing a good thing. Fix bug with jobs not completing properly
Add guid to all messages published so that we can trace them easily