Adjusting makefile, minor corrections, per-object rules
Unifying test config across versions
Adding argc check into generator