Merge "Add follower DPC tests"