Merge pull request #30 from daivanov/master

Fix generic types map creation and unit test for that
Merged Daniil changes
Removing unnecessary branch in execution, which is handled by the following code
Adding type parameter to DataProviderStrategy.getNumberOfCollectionElements()
to allow greater flexibility for data strategy definition