Adding FileStorage to work with multiple files instead and adding tests for it