Updated UploadBehavior & UploadBehaviorTest