improve the tests for the drop handler
merge in trunk, fixing conflicts
fix tests and bug
fix lint
fix test
Merge pull request #129 from benji-york/more-drop-handler-tests