Fixed JSON unit tests
This end up fixing 12 unit tests

Fixed unit tests 5.12.3-11-1, 15.12.3-0-2, 15.12.3-11-10, 15.12.3-11-12.
This end up fixing 12 unit tests
Fixed Unit test 15.12.3-11-12 and more

Unit test 15.12.3-11-12 and also fix 24 other tests as side effect
Clean code before pull request
Comment from Sebatien
Merge pull request #1 from fredericaltorres/master

Fixing some JSON unit tests