better loot test with mocks
fix ref to fldist
fix references changes in refactor