Retain filenames for use as default DataSet names.

1) Template upload uses the filename as the default DataSet name
2) File upload uses the filename as the default DataSet name
3) If the same filename is used multiple times it will start appending (x)
4) Fixed the upload data tests to be separate from eachother (finally)