Upload files testing & improvements.