Updated Similarity Class & Tests