sam fixes - UserTests, ProviderTests
Merge pull request #676 from ab268/sam-fixes

sam fixes - UserTests, ProviderTests