s4:tests.sh - Make also here the change from "upgrade" to "upgrade_from_s3"