Slight test reorganization, prepping for some worker & runner tests.