Bugfixes + Fileupload Test