add int tests and fixes