Redoing some of the int tests properly