further test code cleanup
handling of file uploads