Added tests for JSON binding.
Adjusted tests for recovery.