added conf as parameter to upload methods
move to acceptance style tests