distributor and user tests fixes