Redistribution cleanup and refactoring.
Refactor redistribution tests.