[Elliptic Pi] Change expression to not suffer spurious under/over flow, add test case.