Added the ability to retrieve a folder from root and expanded the upload test