Fixed unit tests for JSON change.: