Fix for test job loading instability