LPS-50919 Fix ID
LPS-49438 fix tests

Use file entry type key instead of name for comparisons.