Fix undock animate code, fix a couple tests