SPARK-2479 Updated DSL and test suite for approximately equal comparisons