Fixed formatting.
Fixed test source generator.
Refactoring.
Refactoring.
Refactoring.
Merge remote-tracking branch 'origin/master' into dev