refactor int.tests - close #6