Modified the uploader + tests so it can handle the prefix directories

Improved version controller tests so it doesn't use the uploader