Took method out of test structures as it is unnecessary
Added file upload tests; now at about 82% coverage