fix in job kind finding, more generic tests