Restructuring tests
WIP

Almost working.  Why am I not seeing Job 5 being broadcast though?