Some refactoring. Also in test dynamic_usb_mount return 1, to avoid spitting into the screen