initial json storage support
Add json storage tests