#27 fixes for int testing