Removed TriggerDrop and added tests.