Use Item entity in ItemDropEvent merges #349, closes #348
fix unit tests