Add and Fix test for upload. Refactoring for admin controller and narrative controller