Revert "corrections and more tests to toints and touints"
Bad merge, regressions, inconsistent code.

This reverts commit 272894f70ca6c90d01930fac694d520f1f813544.