add tests for JsonReader + Refactoring
fix