addressed most of Dwight's code review comments. Added more input files for test generation