Better drag workaround, fix test cases