Refactored test utils to merge in the within tolerance assert.
Minor update to fix module ordering.