Added some tests with clusters.  Fixed an error in the run finding.