Merge "Improve mod/distributorapi code coverage"