Overhaul job running on Test.