Migration of Distribution Protocol and update testcases