Minor cleanups
Fix most of the drag-and-drop unit tests