tests pull request

added a number of tests for file_upload and a suggestion, in tests, of where to go next.

also removed the tests/ dir and moved the one _test.py file into the same module for easier nose'ing.  I guess you'd solved that, but I couldn't get it.