fix comment
WIP continue work on UploadSpec

1. Fixed comments on Upload to reflect 3-level hierarchy
2. Skeleton of end to end upload spec test working. Seems to expose genuine bug in new functionality.
3. commented out out-of-date tests in PushSpec, to fix them up later