fixing valueProviderInIteration
fixing unit tests
Merging origin/dval/master-pending-valueProviderFix into master