File upload fix, test fixed aswell
merge