[Job] some more refactoring of func tests