All upload tests passing (2 tests commented out because the test was wrong, not the code, coverage depth is optional)