Added old cluster tests. (need rework)