- \n \r JSON fix
- some new tests