TDD cUpload complete

TDD when possible done.