corrections and more tests to toints and touints