Tidy code - rename upload and download methods from testing
Tidy code and close #23