rename upload test suite for consistency
refactor code base