Fixed max expire time to correct value (1 year)
Added some more upload tests