Improved upload test