cleaned up code of some tests
support for handling file uploads