distributor and user tests fixes
Merge pull request #481 from alda519/test_fixes

distributor and user tests fixes