Update cluster suite to use json sort keyword.