Added ValueProviderInterface. Fixed tests