Fix a null pointer exception bug
Add a method to get a dropdata index
Work on TD unit testing