Added one more case to the suite, and some refactor
deleting unnecesary files
Slimmed down the install generator
Merge remote-tracking branch 'origin/2-3-stable' into 2-4-stable