Improved Similarity contract tests