Fix JSON regression
more tests