Merge "Move unit tests FormatJsonTest.php to a dedicated file in unit tests"