Fix Storage testing