Merging values_and_comparisons into develop for expected values, results comparisons on measure calculations, and import modal updates