break storage_test into smaller files