Revert "LPS-44724 Complete rollback because it breaks DLFileEntryPermissionTest"

This reverts commit b377186e4cafeb85e19be825fb04d370716a76ba.
LPS-44724 Update tests
Revert "LPS-44724 Update tests"

This reverts commit dd792dd264fad58530383726d567fe3447daac5a.
LPS-44724 I think this is cleaner?