Fix json serialization and update corresponding test

Fix json serialization and update corresponding test #827