Remove test and changed int to Integer