Upload files testing & improvements