improve the tests for the drop handler