distributors-minitest - cleaning up merge
distributors-minitest - still working on things