adding tests and amending toints
adding tests and amending touints