Added one more test to the suite, and some refactor made, still not finished
Modified install generator
Merge remote-tracking branch 'origin/2-3-stable' into 2-4-stable