Merge "Replace ChangeJsonTest by an acceptance test"