Use Item entity in ItemDropEvent merges #349, closes #348
Fixed unit tests broken by item drop change