Added Generator + UnitTests & changes to Configuration files