Add test option to make file
Change return type from Integer to Int