Refactor filestorage signal.
Added utils tests.