Fixing a few more tests due to distributor clean up