Added testclass for drag drop

Cleaned up some code