some fixes to provider
fixed tests