This should improve code readability and possibility of testing
individual functions.
While it slightly increases amount of code, it makes it easier to follow
as well as makes code less nested inside functions.
New generators are also covered with unit tests to ensure their
functionality.
Change-Id: Ic57d4284a85ab3387d642e8628e4626247a6fbe2
Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
986d04c59e