Re-enable upload handler
Blackbox tests mostly working, two still broken.