More .= operator use and syntax simplification
Use Hypot instead of Sqrt

This alters exact test results - the expects are changed to match.