Better tests and improvements for download FSM.