Add testing and testability to dropper