UPDATED: Added more test cases and trying to upgrade generator versions.