Made uploading test smarter