Remove unused private variables.
Extend overflow tests.
Remove unused private variables.
Add remainder of tests for overflow.