Merge pull request #52 from daivanov/master

Unit test for a fix DataProviderStrategy.getNumberOfCollectionElements()
Cleaned code
Cleaned code
Cleaned code