Merge branch 'test-fix' of https://github.com/dimazest/dissect into test-fix